From: Adel Gadllah Date: Fri, 24 Sep 2010 07:31:59 +0000 (+0200) Subject: Revert "StThemeNodeTransition: work around Cogl bug" X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~9710 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1413fa6e03e7d6c282094534cc7ac6e569d007e4;p=gnome-shell.git Revert "StThemeNodeTransition: work around Cogl bug" This reverts commit 8f0f159960d1db92af35ebc6c144b3d1844f43b6. Cogl has been fixed, so it is no longer needed. https://bugzilla.gnome.org/show_bug.cgi?id=629616 --- diff --git a/src/st/st-theme-node-transition.c b/src/st/st-theme-node-transition.c index 3a3eaf2cc..319cea7c3 100644 --- a/src/st/st-theme-node-transition.c +++ b/src/st/st-theme-node-transition.c @@ -263,7 +263,7 @@ setup_framebuffers (StThemeNodeTransition *transition, NULL); cogl_material_set_layer_combine (material_template, 2, "RGBA = MODULATE (PREVIOUS, " - "CONSTANT)", + "PRIMARY)", NULL); } priv->material = cogl_material_copy (material_template); @@ -322,10 +322,9 @@ st_theme_node_transition_paint (StThemeNodeTransition *transition, clutter_alpha_get_alpha (priv->alpha)); cogl_material_set_layer_combine_constant (priv->material, 1, &constant); - cogl_color_set_from_4ub (&constant, - paint_opacity, paint_opacity, - paint_opacity, paint_opacity); - cogl_material_set_layer_combine_constant (priv->material, 2, &constant); + cogl_material_set_color4ub (priv->material, + paint_opacity, paint_opacity, + paint_opacity, paint_opacity); cogl_set_source (priv->material); cogl_rectangle_with_multitexture_coords (priv->offscreen_box.x1,